From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 12 Aug 2013 17:08:53 +0000 (-0400)
Subject: system: Remove rogue separator in lock screen
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3773
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=52ec5cf8e7fba6f73a72e24dc44ef4f9932e4d38;p=gnome-shell.git

system: Remove rogue separator in lock screen

Hide the actions box when none are showing.

https://bugzilla.gnome.org/show_bug.cgi?id=705845
---

diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index 74eb00266..8e889dcc4 100644
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -113,11 +113,21 @@ const Indicator = new Lang.Class({
         this._sessionUpdated();
     },
 
+    _updateActionsVisibility: function() {
+        let visible = (this._settingsAction.visible ||
+                       this._orientationLockAction.visible ||
+                       this._lockScreenAction.visible ||
+                       this._powerOffAction.visible);
+
+        this._actionsItem.actor.visible = visible;
+    },
+
     _sessionUpdated: function() {
         this._updateLockScreen();
         this._updatePowerOff();
         this._updateMultiUser();
         this._settingsAction.visible = Main.sessionMode.allowSettings;
+        this._updateActionsVisibility();
     },
 
     _updateMultiUser: function() {
@@ -183,12 +193,15 @@ const Indicator = new Lang.Class({
         let locked = this._orientationSettings.get_boolean('orientation-lock');
         let icon = this._orientationLockAction.child;
         icon.icon_name = locked ? 'rotation-locked-symbolic' : 'rotation-allowed-symbolic';
+
+        this._updateActionsVisibility();
     },
 
     _updateLockScreen: function() {
         let showLock = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter;
         let allowLockScreen = !this._lockdownSettings.get_boolean(DISABLE_LOCK_SCREEN_KEY);
         this._lockScreenAction.visible = showLock && allowLockScreen && LoginManager.canLock();
+        this._updateActionsVisibility();
     },
 
     _updateHaveShutdown: function() {
@@ -203,6 +216,7 @@ const Indicator = new Lang.Class({
 
     _updatePowerOff: function() {
         this._powerOffAction.visible = this._haveShutdown && !Main.sessionMode.isLocked;
+        this._updateActionsVisibility();
     },
 
     _createActionButton: function(iconName, accessibleName) {
@@ -269,6 +283,7 @@ const Indicator = new Lang.Class({
                                                  can_focus: false });
         item.addActor(hbox, { expand: true });
 
+        this._actionsItem = item;
         this.menu.addMenuItem(item);
     },